Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Feb 2010 10:47:10 +0000 (10:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Feb 2010 10:47:10 +0000 (10:47 +0000)

Trivial merge